cssimagebuiltin: Remove unused variables
authorBenjamin Otte <otte@redhat.com>
Mon, 2 May 2016 17:51:41 +0000 (19:51 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 3 May 2016 10:59:13 +0000 (12:59 +0200)
gtk/gtkcssimagebuiltin.c
gtk/gtkcssimagebuiltinprivate.h

index 59944e15856ec56e50bae882919f7112c734be22..5b059dbc0c7d69aa31e98c0f19a97dac65b70187 100644 (file)
@@ -778,27 +778,11 @@ gtk_css_image_builtin_compute (GtkCssImage             *image,
                                GtkCssStyle             *parent_style)
 {
   GtkCssImageBuiltin *result;
-  GtkBorderStyle border_style;
 
   result = g_object_new (GTK_TYPE_CSS_IMAGE_BUILTIN, NULL);
 
-  border_style = _gtk_css_border_style_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
-  if (border_style == GTK_BORDER_STYLE_SOLID)
-    {
-      GtkBorder border;
-
-      border.top = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
-      border.right = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
-      border.bottom = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
-      border.left = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
-
-      result->border_width = MIN (MIN (border.top, border.bottom),
-                                  MIN (border.left, border.right));
-    }
-
   result->fg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR));
   result->bg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BACKGROUND_COLOR));
-  result->border_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
 
   return GTK_CSS_IMAGE (result);
 }
@@ -811,9 +795,7 @@ gtk_css_image_builtin_equal (GtkCssImage *image1,
   GtkCssImageBuiltin *builtin2 = GTK_CSS_IMAGE_BUILTIN (image2);
 
   return gdk_rgba_equal (&builtin1->fg_color, &builtin2->fg_color)
-      && gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color)
-      && gdk_rgba_equal (&builtin1->border_color, &builtin2->border_color)
-      && builtin1->border_width == builtin2->border_width;
+      && gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color);
 }
 
 static void
index 9ed8a542c9df9a2c191e2ccffe441b8b307afe8d..1ceeeff7ef00d34a42624839f68f442a72c6f96d 100644 (file)
@@ -41,8 +41,6 @@ struct _GtkCssImageBuiltin
 
   GdkRGBA       fg_color;
   GdkRGBA       bg_color;
-  GdkRGBA       border_color;
-  int           border_width;
 };
 
 struct _GtkCssImageBuiltinClass